bitset: Fix typo: gtk_bitset_slice() => gtk_bitset_splice()

diff --git a/docs/reference/gtk/gtk4-sections.txt b/docs/reference/gtk/gtk4-sections.txt
index f3a303e5f090b0c73fa540671859de7dccc89dca..c3091c1b01a381e8b7e016e8e3a67750caba88f5 100644 (file)
--- a/docs/reference/gtk/gtk4-sections.txt
+++ b/docs/reference/gtk/gtk4-sections.txt
@@ -375,7 +375,7 @@ gtk_bitset_subtract
 gtk_bitset_difference
 gtk_bitset_shift_left
 gtk_bitset_shift_right
-gtk_bitset_slice
+gtk_bitset_splice
 <SUBSECTION>
 GtkBitsetIter
 gtk_bitset_iter_init_first

diff --git a/gtk/gtkbitset.c b/gtk/gtkbitset.c
index 1ee80500c999b8973e2970fc82e42722f759017c..6f29e597573c3cfafe0fb2c0766b6b1a18eee136 100644 (file)
--- a/gtk/gtkbitset.c
+++ b/gtk/gtkbitset.c
@@ -707,7 +707,7 @@ gtk_bitset_shift_right (GtkBitset *self,
 }
 
 /**
- * gtk_bitset_slice:
+ * gtk_bitset_splice:
  * @self: a #GtkBitset
  * @position: position at which to slice
  * @removed: number of values to remove
@@ -725,10 +725,10 @@ gtk_bitset_shift_right (GtkBitset *self,
  * up space that can then be filled.
  **/
 void
-gtk_bitset_slice (GtkBitset *self,
-                  guint      position,
-                  guint      removed,
-                  guint      added)
+gtk_bitset_splice (GtkBitset *self,
+                   guint      position,
+                   guint      removed,
+                   guint      added)
 {
   g_return_if_fail (self != NULL);
   /* overflow */

diff --git a/gtk/gtkbitset.h b/gtk/gtkbitset.h
index be0ca58f3bcbb89bb436b758029d6a9b4ba84a17..19528ef55ec40f241efbae616fb231fbb7ea8eda 100644 (file)
--- a/gtk/gtkbitset.h
+++ b/gtk/gtkbitset.h
@@ -125,7 +125,7 @@ GDK_AVAILABLE_IN_ALL
 void                    gtk_bitset_shift_right                  (GtkBitset              *self,
                                                                  guint                   amount);
 GDK_AVAILABLE_IN_ALL
-void                    gtk_bitset_slice                        (GtkBitset              *self,
+void                    gtk_bitset_splice                       (GtkBitset              *self,
                                                                  guint                   position,
                                                                  guint                   removed,
                                                                  guint                   added);

diff --git a/gtk/gtkfilterlistmodel.c b/gtk/gtkfilterlistmodel.c
index 3f8aedb0b30c77347c16df2e5cd7b897dc4ef7be..bd486bf9bfba6a764d6892745c7aa600629c85d4 100644 (file)
--- a/gtk/gtkfilterlistmodel.c
+++ b/gtk/gtkfilterlistmodel.c
@@ -302,9 +302,9 @@ gtk_filter_list_model_items_changed_cb (GListModel         *model,
   else
     filter_removed = 0;
 
-  gtk_bitset_slice (self->matches, position, removed, added);
+  gtk_bitset_splice (self->matches, position, removed, added);
   if (self->pending)
-    gtk_bitset_slice (self->pending, position, removed, added);
+    gtk_bitset_splice (self->pending, position, removed, added);
 
   if (added > 0)
     {

diff --git a/gtk/gtkmultiselection.c b/gtk/gtkmultiselection.c
index 4dd93b52348c05012a3c65042f3ff657a0bc4549..6c754f77a8b1822e4a03bf1968084d126b5eea5e 100644 (file)
--- a/gtk/gtkmultiselection.c
+++ b/gtk/gtkmultiselection.c
@@ -222,7 +222,7 @@ gtk_multi_selection_items_changed_cb (GListModel        *model,
   GHashTable *pending = NULL;
   guint i;
 
-  gtk_bitset_slice (self->selected, position, removed, added);
+  gtk_bitset_splice (self->selected, position, removed, added);
 
   g_hash_table_iter_init (&iter, self->items);
   while (g_hash_table_iter_next (&iter, &item, &pos_pointer))

diff --git a/testsuite/gtk/bitset.c b/testsuite/gtk/bitset.c
index 8a84648324e868a34e0340a40a5ce36ebdd411d5..110dc1401ebd34672e5632da3070e112473ff33c 100644 (file)
--- a/testsuite/gtk/bitset.c
+++ b/testsuite/gtk/bitset.c
@@ -424,13 +424,13 @@ test_slice (void)
 
   gtk_bitset_add_range (set, 10, 30);
 
-  gtk_bitset_slice (set, 20, 10, 20);
+  gtk_bitset_splice (set, 20, 10, 20);
 
   for (i = 0; i < 60; i++)
     g_assert_cmpint (gtk_bitset_contains (set, i), ==, (i >= 10 && i < 20) ||
                                                        (i >= 40 && i < 50));
 
-  gtk_bitset_slice (set, 25, 10, 0);
+  gtk_bitset_splice (set, 25, 10, 0);
 
   for (i = 0; i < 60; i++)
     g_assert_cmpint (gtk_bitset_contains (set, i), ==, (i >= 10 && i < 20) ||
@@ -549,7 +549,7 @@ test_splice_overflow (void)
   GtkBitset *set, *compare;
 
   set = gtk_bitset_new_range (3, 1);
-  gtk_bitset_slice (set, 0, 0, 13);
+  gtk_bitset_splice (set, 0, 0, 13);
 
   compare = gtk_bitset_new_range (16, 1);
   g_assert_true (gtk_bitset_equals (set, compare));